xen/xsm: Compile error due to naming clash between XSM and EFI runtime
authorJames Carter <jwcart2@tycho.nsa.gov>
Sat, 17 Sep 2011 15:20:58 +0000 (16:20 +0100)
committerJames Carter <jwcart2@tycho.nsa.gov>
Sat, 17 Sep 2011 15:20:58 +0000 (16:20 +0100)
commitd285a773d6f5d7fb4e654291b5fce90bb8ec8852
tree47d6bf92617042a7788af7af610fa020c364a9e2
parent4dd27c01c31c55319758b47dccdba46ddd5f499e
xen/xsm: Compile error due to naming clash between XSM and EFI runtime

The problem is that efi_runtime_call is the name of both a function in
xen/arch/x86/efi/runtime.c and a member of the xsm_operations struct
in xen/include/xsm/xsm.h. This causes the macro "#define
efi_runtime_call(x) efi_compat_runtime_call(x)" on line 15 of
xen/arch/x86/x86_64/platform_hypercall.c to cause the above compile
error.

Renaming the XSM struct member fixes the problem.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/arch/x86/platform_hypercall.c
xen/include/xsm/xsm.h